Fixed long-standing typo in aspect ratio computation code. (pointed out by

Sat Dec  5 21:07:09 1998  Owen Taylor  <otaylor@gtk.org>

     * gtk/gtkaspectframe.c (gtk_aspect_frame_size_allocate): Fixed
       long-standing typo in aspect ratio computation code.
       (pointed out by Sebastian Rittau <srittau@jroger.in-berlin.de>)

diff --git a/ChangeLog b/ChangeLog
index c1249cef4b9005764d86e77bc241d9b0532a23ae..2e53436273c5724a933b46e07e5bc909b9a2152c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Dec  5 21:07:09 1998  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtkaspectframe.c (gtk_aspect_frame_size_allocate): Fixed
+       long-standing typo in aspect ratio computation code.
+       (pointed out by Sebastian Rittau <srittau@jroger.in-berlin.de>)
+
 Fri Dec  4 01:20:06 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_release): call toggle_row with

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c1249cef4b9005764d86e77bc241d9b0532a23ae..2e53436273c5724a933b46e07e5bc909b9a2152c 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sat Dec  5 21:07:09 1998  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtkaspectframe.c (gtk_aspect_frame_size_allocate): Fixed
+       long-standing typo in aspect ratio computation code.
+       (pointed out by Sebastian Rittau <srittau@jroger.in-berlin.de>)
+
 Fri Dec  4 01:20:06 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_release): call toggle_row with

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c1249cef4b9005764d86e77bc241d9b0532a23ae..2e53436273c5724a933b46e07e5bc909b9a2152c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sat Dec  5 21:07:09 1998  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtkaspectframe.c (gtk_aspect_frame_size_allocate): Fixed
+       long-standing typo in aspect ratio computation code.
+       (pointed out by Sebastian Rittau <srittau@jroger.in-berlin.de>)
+
 Fri Dec  4 01:20:06 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_release): call toggle_row with

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c1249cef4b9005764d86e77bc241d9b0532a23ae..2e53436273c5724a933b46e07e5bc909b9a2152c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sat Dec  5 21:07:09 1998  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtkaspectframe.c (gtk_aspect_frame_size_allocate): Fixed
+       long-standing typo in aspect ratio computation code.
+       (pointed out by Sebastian Rittau <srittau@jroger.in-berlin.de>)
+
 Fri Dec  4 01:20:06 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_release): call toggle_row with

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c1249cef4b9005764d86e77bc241d9b0532a23ae..2e53436273c5724a933b46e07e5bc909b9a2152c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sat Dec  5 21:07:09 1998  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtkaspectframe.c (gtk_aspect_frame_size_allocate): Fixed
+       long-standing typo in aspect ratio computation code.
+       (pointed out by Sebastian Rittau <srittau@jroger.in-berlin.de>)
+
 Fri Dec  4 01:20:06 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_release): call toggle_row with

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c1249cef4b9005764d86e77bc241d9b0532a23ae..2e53436273c5724a933b46e07e5bc909b9a2152c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sat Dec  5 21:07:09 1998  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtkaspectframe.c (gtk_aspect_frame_size_allocate): Fixed
+       long-standing typo in aspect ratio computation code.
+       (pointed out by Sebastian Rittau <srittau@jroger.in-berlin.de>)
+
 Fri Dec  4 01:20:06 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_release): call toggle_row with

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c1249cef4b9005764d86e77bc241d9b0532a23ae..2e53436273c5724a933b46e07e5bc909b9a2152c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sat Dec  5 21:07:09 1998  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtkaspectframe.c (gtk_aspect_frame_size_allocate): Fixed
+       long-standing typo in aspect ratio computation code.
+       (pointed out by Sebastian Rittau <srittau@jroger.in-berlin.de>)
+
 Fri Dec  4 01:20:06 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_release): call toggle_row with

diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c
index ba017614c7fe1eb57500b443b7bc11231a440d63..5ee502266b1e8dec745ad261af34be5e4901691d 100644 (file)
--- a/gtk/gtkaspectframe.c
+++ b/gtk/gtkaspectframe.c
@@ -301,9 +301,8 @@ gtk_aspect_frame_size_allocate (GtkWidget     *widget,
                bin->child->requisition.height;
              if (ratio < MIN_RATIO) ratio = MIN_RATIO;
            }
-         else
-           if (bin->child->requisition.height != 0)
-             ratio = MAX_RATIO;
+         else if (bin->child->requisition.width != 0)
+           ratio = MAX_RATIO;
          else
            ratio = 1.0;
        }